[GEN][ZH] Fix black terrain in World Builder without RTS_DEBUG #1190

xezon · 2025-06-24T20:24:20Z

Fixes Terrain renders black in World Builder #1186
Partially fixes [ZH] World Builder behaves differently when built with RTS_BUILD_OPTION_DEBUG enabled #1116
Merge after [CMAKE] Remove obsolete interface libraries, add missing core gameengine include interface library #1036

This change fixes the black terrain in World Builder without RTS_DEBUG. This issue happens because all code around GlobalData::m_shroudOn is compiled out without RTS_DEBUG, which enables shroud and turns the world black.

TODO

Rebase after [CMAKE] Remove obsolete interface libraries, add missing core gameengine include interface library #1036 is merged
Replicate in Generals

Caball009 · 2025-06-27T11:24:48Z

This fix works as intended for me.

xezon · 2025-06-28T17:18:19Z

Rebased on latest main.

ViTeXFTW · 2025-06-30T07:16:49Z

What are the necessary changes to have WB work in release (without RTS_INTERNAL)? I feel like that should also be a target goal.

xezon · 2025-06-30T07:18:50Z

If you know of more things broken in Release World Builder, please create a report. I only noticed the Terrain and System Maps thing.

ViTeXFTW · 2025-06-30T15:03:35Z

Also tested and works as advertised

…ine include interface library

xezon · 2025-06-30T21:05:34Z

Rebased.

Replicated in Generals with conflicts.

$ git diff 28adea33cec5ca38d28ce276ed668d4e8db9e46a..b0ef819c2278fba9e2adb993de5b0f1480bf07c7 > changes.patch

$ git apply -p2 --directory=Generals --reject --whitespace=fix changes.patch
changes.patch:42: trailing whitespace.

changes.patch:198: space before tab in indent.
        TheDisplay->drawImage( m_overlayImage, ul.x, ul.y, lr.x, lr.y );
Checking patch Generals/GameEngine/Include/Common/GameDefines.h...
error: Generals/GameEngine/Include/Common/GameDefines.h: No such file or directory
Checking patch Generals/Code/GameEngine/Include/Common/GameCommon.h...
Hunk #1 succeeded at 52 (offset -6 lines).
Checking patch Generals/Code/GameEngine/Include/Common/GlobalData.h...
error: while searching for:
#include "Common/SubsystemInterface.h"
#include "GameClient/Color.h"
#include "Common/STLTypedefs.h"
#include "Common/GameCommon.h"
#include "Common/Money.h"

// FORWARD DECLARATIONS ///////////////////////////////////////////////////////////////////////////

error: patch failed: Generals/Code/GameEngine/Include/Common/GlobalData.h:39
error: while searching for:
  Bool m_TiVOFastMode;            ///< When true, the client speeds up the framerate... set by HOTKEY!



#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
        Bool m_wireframe;
        Bool m_stateMachineDebug;
        Bool m_useCameraConstraints;
        Bool m_shroudOn;
        Bool m_fogOfWarOn;
        Bool m_jabberOn;
        Bool m_munkeeOn;

error: patch failed: Generals/Code/GameEngine/Include/Common/GlobalData.h:482
Checking patch Generals/Code/GameEngine/Include/Precompiled/PreRTS.h...
Checking patch Generals/Code/GameEngine/Source/Common/CommandLine.cpp...
Checking patch Generals/Code/GameEngine/Source/Common/GlobalData.cpp...
error: while searching for:
#endif
  m_TiVOFastMode = FALSE;

#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
        m_wireframe = 0;
        m_stateMachineDebug = FALSE;
        m_useCameraConstraints = TRUE;
        m_shroudOn = TRUE;
        m_fogOfWarOn = FALSE;
        m_jabberOn = FALSE;
        m_munkeeOn = FALSE;

error: patch failed: Generals/Code/GameEngine/Source/Common/GlobalData.cpp:548
Checking patch Generals/Code/GameEngine/Source/GameClient/GameClient.cpp...
Hunk #1 succeeded at 619 (offset -38 lines).
Hunk #2 succeeded at 650 (offset -38 lines).
Checking patch Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp...
Hunk #1 succeeded at 2488 (offset -60 lines).
Checking patch Generals/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp...
Hunk #1 succeeded at 1267 (offset 12 lines).
Hunk #2 succeeded at 1287 (offset 12 lines).
Hunk #3 succeeded at 1424 (offset 12 lines).
Checking patch Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/BaseHeightMap.cpp...
error: Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/BaseHeightMap.cpp: No such file or directory
Checking patch Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp...
Hunk #1 succeeded at 104 (offset -1 lines).
Hunk #2 succeeded at 758 (offset -38 lines).
Checking patch Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp...
Hunk #1 succeeded at 850 (offset -144 lines).
Checking patch Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp...
Hunk #1 succeeded at 411 (offset -22 lines).
Applied patch Generals/Code/GameEngine/Include/Common/GameCommon.h cleanly.
Applying patch Generals/Code/GameEngine/Include/Common/GlobalData.h with 2 rejects...
Rejected hunk #1.
Rejected hunk #2.
Applied patch Generals/Code/GameEngine/Include/Precompiled/PreRTS.h cleanly.
Applied patch Generals/Code/GameEngine/Source/Common/CommandLine.cpp cleanly.
Applying patch Generals/Code/GameEngine/Source/Common/GlobalData.cpp with 1 reject...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Rejected hunk #3.
Applied patch Generals/Code/GameEngine/Source/GameClient/GameClient.cpp cleanly.
Applied patch Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp cleanly.
Applied patch Generals/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp cleanly.
Applied patch Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp cleanly.
Applied patch Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp cleanly.
Applied patch Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp cleanly.

xezon · 2025-06-30T21:06:20Z

This needs an approval.

ViTeXFTW · 2025-07-01T11:56:33Z

Wish I could

ViTeXFTW · 2025-07-01T14:21:24Z

By the way, this change also makes the release WorldBuilder work as expected. I think the only issues was no handling of shroud clearing

Caball009

Code changes look ok; tested with ZH WB and works as intended.

# Conflicts: # Generals/Code/GameEngine/Source/Common/CommandLine.cpp # Generals/Code/GameEngine/Source/Common/GlobalData.cpp # Generals/Code/GameEngine/Source/GameClient/GameClient.cpp # Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp # Generals/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp # Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp # Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp # Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp # GeneralsMD/Code/GameEngine/Source/Common/CommandLine.cpp # GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp # GeneralsMD/Code/GameEngine/Source/GameClient/GameClient.cpp # GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp # GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp # GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/BaseHeightMap.cpp # GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp # GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp # GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp

GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp

xezon · 2025-07-11T20:24:56Z

Main merged.

xezon added this to the Major bug fixes milestone Jun 24, 2025

xezon added Major Severity: Minor < Major < Critical < Blocker WorldBuilder Relates to World Builder Fix Is fixing something, but is not user facing labels Jun 24, 2025

xezon force-pushed the xezon/fix-black-terrain branch from 4455050 to c369e8e Compare June 24, 2025 20:32

Caball009 linked an issue Jun 25, 2025 that may be closed by this pull request

[ZH] World Builder behaves differently when built with RTS_BUILD_OPTION_DEBUG enabled #1116

Closed

xezon force-pushed the xezon/fix-black-terrain branch from c369e8e to d204b44 Compare June 28, 2025 17:17

xezon requested a review from a team June 29, 2025 09:07

ViTeXFTW mentioned this pull request Jun 30, 2025

[GEN][ZH] Show the System Maps tab in World Builder without RTS_DEBUG #1191

Merged

1 task

xezon added 5 commits June 30, 2025 22:42

[CMAKE] Remove obsolete interface libraries, add missing core gameeng…

28adea3

…ine include interface library

[ZH] Fix black terrain in World Builder without RTS_DEBUG

5406baa

Rename macro to ENABLE_CONFIGURABLE_SHROUD

b0ef819

Replicate in Generals

a3b58b6

Remove nearby whitespace in GlobalData.h

66b5e72

xezon force-pushed the xezon/fix-black-terrain branch from d204b44 to 66b5e72 Compare June 30, 2025 21:04

Caball009 approved these changes Jul 11, 2025

View reviewed changes

xezon added 2 commits July 11, 2025 22:15

Update comment

a5aa192

xezon commented Jul 11, 2025

View reviewed changes

GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp Outdated Show resolved Hide resolved

Fix ShroudOn INI parsing

0af0dbe

xezon added 3 commits July 11, 2025 22:48

Fix whitespace

928bf98

Simplify CommandLine change

0385695

Fix Release build compile

7678ffe

xezon merged commit 53c4a78 into TheSuperHackers:main Jul 11, 2025
14 checks passed

xezon deleted the xezon/fix-black-terrain branch July 11, 2025 21:46

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[GEN][ZH] Fix black terrain in World Builder without RTS_DEBUG #1190

[GEN][ZH] Fix black terrain in World Builder without RTS_DEBUG #1190

Uh oh!

xezon commented Jun 24, 2025 •

edited

Loading

Uh oh!

Caball009 commented Jun 27, 2025

Uh oh!

xezon commented Jun 28, 2025

Uh oh!

ViTeXFTW commented Jun 30, 2025

Uh oh!

xezon commented Jun 30, 2025

Uh oh!

ViTeXFTW commented Jun 30, 2025

Uh oh!

xezon commented Jun 30, 2025

Uh oh!

xezon commented Jun 30, 2025

Uh oh!

ViTeXFTW commented Jul 1, 2025

Uh oh!

ViTeXFTW commented Jul 1, 2025

Uh oh!

Caball009 left a comment •

edited

Loading

Uh oh!

Uh oh!

xezon commented Jul 11, 2025

Uh oh!

Uh oh!

Uh oh!

[GEN][ZH] Fix black terrain in World Builder without RTS_DEBUG #1190

[GEN][ZH] Fix black terrain in World Builder without RTS_DEBUG #1190

Uh oh!

Conversation

xezon commented Jun 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

TODO

Uh oh!

Caball009 commented Jun 27, 2025

Uh oh!

xezon commented Jun 28, 2025

Uh oh!

ViTeXFTW commented Jun 30, 2025

Uh oh!

xezon commented Jun 30, 2025

Uh oh!

ViTeXFTW commented Jun 30, 2025

Uh oh!

xezon commented Jun 30, 2025

Uh oh!

xezon commented Jun 30, 2025

Uh oh!

ViTeXFTW commented Jul 1, 2025

Uh oh!

ViTeXFTW commented Jul 1, 2025

Uh oh!

Caball009 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

xezon commented Jul 11, 2025

Uh oh!

Uh oh!

Uh oh!

xezon commented Jun 24, 2025 •

edited

Loading

Caball009 left a comment •

edited

Loading